Use g_clear_list macros

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/4176>

diff --git a/src/shell-app.c b/src/shell-app.c
index 34f75c18558433638154992f7b2cd1000a08a9c6..ed7ecfffe33e445054515979cff281a41da3ac3d 100644 (file)
--- a/src/shell-app.c
+++ b/src/shell-app.c
@@ -333,8 +333,7 @@ find_most_recent_transient_on_same_workspace (MetaDisplay *display,
    * returned from the sort_windows_by_stacking function)
    */
   transients_sorted = g_slist_reverse (transients_sorted);
-  g_slist_free (transients);
-  transients = NULL;
+  g_clear_slist (&transients, NULL);
 
   result = NULL;
   for (iter = transients_sorted; iter; iter = iter->next)

diff --git a/src/st/croco/cr-parser.c b/src/st/croco/cr-parser.c
index 4abf3b9074a20abf4e35dddd98ec59198fb5fa9c..864e287e7c066be225d7901f555dbe02c4ebf966 100644 (file)
--- a/src/st/croco/cr-parser.c
+++ b/src/st/croco/cr-parser.c
@@ -2474,8 +2474,7 @@ cr_parser_parse_stylesheet (CRParser * a_this)
                                         }
                                 }
 
-                                g_list_free (media_list);
-                                media_list = NULL;
+                                g_clear_list (&media_list, NULL);
                         }
 
                         if (import_string) {
@@ -3665,8 +3664,7 @@ cr_parser_parse_import (CRParser * a_this,
                         }
                 }
 
-                g_list_free (*a_media_list);
-                *a_media_list = NULL;
+                g_clear_list (&*a_media_list, NULL);
         }
 
         if (*a_import_string) {
@@ -3818,8 +3816,7 @@ cr_parser_parse_media (CRParser * a_this)
                         cr_string_destroy (cur->data);
                 }
 
-                g_list_free (media_list);
-                media_list = NULL;
+                g_clear_list (&media_list, NULL);
         }
 
         cr_parser_clear_errors (a_this);
@@ -3846,8 +3843,7 @@ cr_parser_parse_media (CRParser * a_this)
                         cr_string_destroy (cur->data);
                 }
 
-                g_list_free (media_list);
-                media_list = NULL;
+                g_clear_list (&media_list, NULL);
         }
 
         cr_tknzr_set_cur_pos (PRIVATE (a_this)->tknzr, &init_pos);

diff --git a/src/st/croco/cr-statement.c b/src/st/croco/cr-statement.c
index 7783545164fbb70132f43bececf8170fb9051ade..45e305e587e499f9db4170faf704b2ee0d05ed83 100644 (file)
--- a/src/st/croco/cr-statement.c
+++ b/src/st/croco/cr-statement.c
@@ -513,8 +513,7 @@ cr_statement_clear (CRStatement * a_this)
                                 }
 
                         }
-                        g_list_free (a_this->kind.media_rule->media_list);
-                        a_this->kind.media_rule->media_list = NULL;
+                        g_clear_list (&a_this->kind.media_rule->media_list, NULL);
                 }
                 g_free (a_this->kind.media_rule);
                 a_this->kind.media_rule = NULL;
@@ -1403,8 +1402,7 @@ cr_statement_at_import_rule_parse_from_buf (const guchar * a_buf,
                                 media_list->data = NULL;
                         }
                 }
-                g_list_free (media_list);
-                media_list = NULL;
+                g_clear_list (&media_list, NULL);
         }
         if (import_string) {
                 cr_string_destroy (import_string);

diff --git a/src/st/st-theme.c b/src/st/st-theme.c
index afff58db1309bf3d373454e1e5f63d260fdaafbf..1b55015cde3b5c8e9c675a258fa333ef1ee7f2fb 100644 (file)
--- a/src/st/st-theme.c
+++ b/src/st/st-theme.c
@@ -387,8 +387,7 @@ st_theme_finalize (GObject * object)
   StTheme *theme = ST_THEME (object);
 
   g_slist_foreach (theme->custom_stylesheets, (GFunc) cr_stylesheet_unref, NULL);
-  g_slist_free (theme->custom_stylesheets);
-  theme->custom_stylesheets = NULL;
+  g_clear_slist (&theme->custom_stylesheets, NULL);
 
   g_hash_table_destroy (theme->stylesheets_by_file);
   g_hash_table_destroy (theme->files_by_stylesheet);